Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 11 Feb 2010 10:21:09 +0000 (10:21 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 11 Feb 2010 10:21:09 +0000 (10:21 +0000)

Trivial merge